saved some lines of code
working