Move things to private methods