cleanup for better view