Added chalk and cleaned up