Fix-indentation and white space issues