File standardize - Updated. 

Grouping modifications in #20   along with some cosmits.