Code cleanup.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>