Code restyling and task status change added