Removed hard coded characters from flag/unflag