Various tweaks to #314

Use plain object getters and code style