feat/local: minor cleanup and comments
Merge branch 'feat/local' into develop