Code improvements, more OOP oriented
Little code improvement