Start clean up, pair down and commenting of code