Refactored a few objects on module pattern