Cleaned up controller logging