Chore/general stylin