fix indentations & unwrap, some cleanups