Cleanup, indentations adjustments and such