1-31 separated code into classes