Separated code into modules
Updated "CleanUp" method
Updated Template