Cleaned up unnecessary lines of code