Dev quality

Fix some outlying code quality issues.