First version
Clean up a few things