minor tweaks (UNTESTED!): remove semicolons, whitespace, simplify libraries to build test