cleaning up i think