Lining up argument parse code
general tidying of code, removing redundancy, adding whitespace and capitalizing comments
another alignment fix