Added size classes/cleaned up magic numbers