Removed and combined functions
Fixed link wrapping