Cleaned up steps