Clean up and additional comments