Obey 80-chars column limit, better formatting, freeze constant list