Refactored inital commit