cleaning namespace - fixing methods