remove unused var
Refactored last steps