tidy up and use asset pipeline