Cleaned up text class