fixing layout issues, improving code legibility.