Can 6 be a constant instead of a magic number please?