Changed Todo style to inline, removed some redundant parts