Clean up; spaces to tabs, func expression to declaration