better conventions, more readability