Make code fit better