Utility updates
Updated String parsing to include the zero termination
Refactoring
Renamed