General cleanup

Just some general cleanup done