some stylistic changes to get rid of useless space