Tidy up Website generation