Changed code style, Fixed documentation