Clean up and additional commenting