WIP: improving style