Cleaned up ApiController