Cleaned up for challenge submission