Did some cleanup for better readability