Minor changes

- making code look more beautiful
Dependency Conflic resolved

- spring-data-commons-core removed from pom