Finished Refactoring :)