cleanup for code inspection