hlinted it all up
Merge branch 'hlinting'