DRY up and comment