Miscellanies indention fixes and cleanup