increased code quality? (hopefully)