fix timer object issue, better indentation, v1.2.1