Bringing the implementation closer to the design
More cosmetic improvements