Convert tabs to spaces
Code refactor and cleanup, removed unnecessary imports