Simplify return value handling
Cleanup code spacing
Simplify parameter appending
Code format cleanup
Code format cleanup
Revamp parameter prechecks