Update style, consolidate collisions & conventions