Cleanup

cleaned up some shtuff