Code formatting and remove commented code <see#137>T:20m