Cleaned up based on feedback