Cleaned up TinyLib