Cleans up and simplifies, adds view count