Tweaking commented code for future reference