Updated copyright information and cleaned up a bit