Slight code tweaks after taking PR