removed excess imorts & tidied code
Fixed git unmerged files