Remove deprecation warning from 0.11.0
minor refactors
Fix Makefile bug