Initial attempt at clean up