Adding an example; removing redundant stuff and more