magic number fix and checkstyle