Fix for PEP8 and Builder fix