Mainly cleanups and convention ports