Add some todos and improve code styling #2.