Improve Camera, change design
Clean