Fixing code formatting, commenting out unused testcode