Position render fix and little code cleanup