Performed more refactoring :).