Tidied code up and added Y velocity