Added polymer and cleaned up a bit