More control comments/refactors