Indentation fixes to Andrey's code