simply neatening up the code