Code beautify and updated docs