Updated contact information and cleaned up code.