Cleanup and more best practices