indentation and more refactoring to improve pom readability and separation of concerns