Avoid redundant looping
Improve encapsulation