moving stuff around to make it all proper
removing uneeded import