Refining code, putting on semantic fit and finish