Basic clean up for starters

It does the basic clean up