Refactored magic number
Sillyness