minor adjustments regarding layout of code