Optimise to ensure least amount of whitespace around equal sign and not add newline at the end.

Fixed equal sign to align with the least amount of whitespace.
Fixed to not add a newline at after the last line.