cleaned more code