few changes and cleanup