Just some minor source code adjustments for readability. Logic is untouched