Cleaned up Pie for stylistic and parsing consistency for later patches