Code polishing part 2... ;)