revisions based on code review: Magic numbers, const, common file and addition design