--HR-250 Code cleanup and indentation