Chore/clean up sections