added @EnableWebMvc annotation and minor cleanup