Cleaned up syntax and style