Cleanup and prep for merge

Signed-off-by: Matthew Schick <matthew.schick@gmail.com>