few tweaks and code cleanup