Universal Format second step + cleaning
Merge branch 'master' of https://github.com/krajj7/pikater