Swig, data, refactor, styles