starter fixes for code cleanup.