better layout of code