Simplify/refactor symbol drawing