Code cleanup

Nothing changed, just reducing line length, tweaked some comments