Remove commented code, format Readme