Cosmetics + some documentation