Fix indentation, code style and accessors