some changes to styling and naming