Removed test code - and ran some formatting