Tidied up steps