Cleanup of code and aim rotation fix