code cleanup fit and finish