fix indentation, add some rules