Code readibility improvements