cleanup for better readability