Cleanup

Some general cleanup