Simplify outputs code, also log all to file