Updated to clean up rpub