Improve style, remove base. Fixes #38