Cosmetic correction
Removed unnecessary variable
Fake to bypass SDL in test + minor refactor
Minor refactor + got rid of debug funct