fix spacing & naming