cleaned up unnecessary complications