code cleanup
poi classification update