Reindentation and some tweaking