Little cleanup pt.2