puts all in correct module and removed unused code