Enhance readability and Fix #9