cleanuped code
celanup more code