Chore/cleanup