Useing soft tabs and remove unused code