Minor clean up + fixed camera