cleaned up improved indentation
removed unused code
removed unused code