rearrange config file and add comments
use return statement in a method