Fixed naming convention, code style, info