Fix code style and add short const
Short const moved and up readme