cleanup, resolved warnings