Cleaned up cmake