Minor Refactoring to make the class more clear
Removed temporary file