Added autoformating