Minor and unncessary refactoring...