Cleaned up a bit camera things