cleaned up flags