Source Cleanup

Just some re-formatting to make everything consistent