Done a little bit of cleanup