code cleanup, prepare for new portlet