13 Commits (feature/general-cleanup)