Standardizing/Fixing some formatting