Spring Clean up

More Content