Switching props to .prop(), further cleanup, changes made from feedback