I noticed some warnings (strings that could be extracted, unnecessary else branches...) that can easily be resolved. This will make the code cleaner :)