some small changes and cleanup