Made few tweaks