Removed uneeded code + trim && || from the end of rules