Updated to latest version
Updated code style