#10 Add stylistic changesw in standalone version.