cleaning up and working locally