Tweak func formatting, less lines