making code a little nicer again