com[artimentalized code and cleaned