TASK: code clenup
--it's better now in terms of organization
--also the code works ... unlike the last commit