Clean up & comment dumb code