Cleanup of controller, fixes in github_client