Cleaned up default controller