cleaning up syntax, removed unnecessary boolean