Cleaned up formatting inconsistencies