Final version

Corrected some style