Code cleanup, Code encapsulation