Code cleaning & extended git properties

No functional changes, but shorter code & ready for easier future changes.