Improve code consitency