A bit of cleanup, code updated to Minetweak Developer Guidelines