Rendering views + code cleanup