REfomatted code