code formatting
removed unused code