fixed some redundant cosmetics