Remove dead code path in controller, give more meaningful name to buffer variables.