Picture controlelr code review