coding convention
changed order just for consistency