Updates/cleanup.

Signed-off-by: Tom Green <kingofcuddles@gmail.com>