Initial Clean Up

Signed-off-by: Ricky Lee Whittemore <ricky.lee@mac.com>