Formatting changes, removal of cout/commented code