Update style. Close #3 and close #2