Remove redundant code. Privatize methods