Camera class cleanup and added comments