IssueID #16 : code indent refactoring