API re-work, styles updated