Restructur round 3 and linting