Added documentation
More cosmetics