Cleaned up controller

Signed-off-by: A.Prooks <aprooks@live.ru>
merge fix

Signed-off-by: A. Prooks <aprooks@live.ru>