Cleaned up the throws controller