Cleaned slightly