-Cleanup of code

Signed-off-by: Brandon Skrtich <bskrtich@gmail.com>