Use prebuilt Camera, and did some cleaning up