removed unnecessary complexity