local-review

Review current changes against project guidelines before PR