fixed some redundant stuff