Feature demo refacto and style