Fix typo
Code tweaks