Completed item functionality, need to refactor code to be more readable and maintainable