Code cleanup
Merge branch 'cleanup' of https://github.com/tambry/BuildCraft into tambry-cleanup
Merge branch 'tambry-cleanup' into 6.1.x