Cleanup and simplified structure