refactor MagicNumberChecker to be more simple

Pull Request #6 just contains old updates only, I forgot to add fixed MagicNumberChecker into pull request #6.