Added camera params and cleaned up