Second part of Controller review/update