Cleanup and additional comments