Tidy and convert to Slim