PEP8 formatting mostly, todo add