Refactored some magic constants