Improve look and close #10