Fix PEP8 and #18