Cleaned up syntax and whitespace