Code cleanup
declare namespace