Cleaning up & adding explanations