Minor Refactor

More code cleaning
Removed redundant code
Moved class to util package