Minor changes and cleanup