Improve codding readibility
Related to #27