Refactory, removed dependecies.