Code cleanup style