Refactored/Reformatted