ticket:10 Magic numbers removed with constants, defined inside of a model class
Merge branch 'ticket_10'