Some formatting

80 chars, comments with #, trailing space removal