This is the way! Small commits with descriptive commit names, then just fixup into a few feature commits. Makes rebase a breeze.