improving modularity according to graham's remarks.