Replaced tabs and improved imports