code clenaup again