More refactor and cleanup.

Signed-off-by: King Lemming <kinglemming@gmail.com>