Adjusted some content according to @Sean suggestions