Refactored basic rendering