refresh, code cleanup