Fixing cleanup and untabifying