cleaned up code

basically done for client side due date 11/14/14