Small structure fixes, PEP8