optimize and improve code style #155