Tidy up functionality and style task items