Code Updates

Updated comments in code, removed commented test code