Remove unneeded $stamp
Fixed alignment
Added docblocks