Cleaning up from refactoring
Improving param handler and renaming