clean up and starting on aiming