Little editing and cleanup