(>) code cleanup