Cleaning up unnecessary lines a bit