[FIX] More PEP8 and conventions