Chore/code cleanup

Fix #38