Fix code style and finally close #51