Cleaned up and seperated controller actions