Refactoring variable
Fixing stupity on checks