Missed return on partial rendering method

Also a few cleanups on source, mainly getting return to be consistent