Merge pull request #1 from fuuuu/master

Spring clean up