Fixing white space/indentation - work in progress