Methods annotations and style fixed.