Cleaned up code instead of sending it to rework