Cleaned up to take more responsibility