Cleaned up cmake files a bit