Cleanup source code

Signed-off-by: Oliver Yang <yangoliver@gmail.com>