Started cleaning the code for client side prediction