Doing some cleaning

Signed-off-by: Eric Barnes <eric@ericlbarnes.com>