Code cleaning & extended git properties