Use comm1 where proper

Use comm1 where proper instead of code duplication