changes and cleanup