Reorder modifiers to comply with java standards