Removed unnecessary checks & fixed title