Cleanups, Syntax fixes

Fixes easybib/issues#169
References easybib/issues#171