Formatting + removing .svn dirs
Formatting + code cleanup