Removed redundant logics and unnecessary spaces