Cleanups & PEP8