refactoring draw calls a bit