code formatted with "Maven Style"
refactor and clean up the code