moved object to subject and cleaned up a bit