More code refacotring! =D