Minnor changes
Code re-estructuration