Functions improved. Applying better OOP Practices.