Cleanup and added profile url