Code clean-up, indentation and line-spacing