Cleaning, indents and minor modifications etc.