Remove saving to disk
Small reformatting