comments and testability improvments