Removed "this" keyword for static access
Moved an If check under its element