Yeah I thought about it, I just wanted to reduce the number of changes. Done: https://github.com/JaviSoto/Commando/commit/731c3178cb2f60e9fba4c3161b6ba1da41cf4571