slowly making code consistent