Small tweaks

Made small tweaks