Refactor camera code

Created by: AndreaClement