Comments + minor moving
3 files changed