Code Clean up and some Changes to LookAt