Changing env and hooks to make them a bit prettier