LO removed and code tidy.