Cleans up class and adds tikz in-line code command