Fixed some formatting and spring context loading