Minor comment changes
Custom Exception classes
Internal data representation updates