Cleaned up spacing, and fixed power expressions