Simplify parameter appending
Code reformatting
Blank line cleanup