Minor tweaks + added setter