Small tweaks and remove redundant