Code cleaning & extended git properties

No functional changes, but shorter code & ready for easier future changes.
Small alignment problem. Indentation should be tabs, and spaces should be used for alignment after indentation.