Fix camera positioning so that it is in between avatar's eyes. Plus
some code clean up.