code cleans up