cleanup and issue 4