some cleanup, nothing fancy