cleanup + fix cli controller