Adding documentation and alignment