Minor style changes
Relax base dependency