Code Cleanup on the client side of things