Moved to PeP8 complaint code
Changed tabs by spaces