reformatting to match gitana standards