Make sure that operators are at the beginning of the line in a multiline context
Split unnecessary long lines
Reduce unnecessary broad visibility, cleanup code