Cleanup and better rendering