fixing some style issues, line length, spacing, etc