Indenting and cleanup