Fixed names and cleaned out unused function.