Submitting a small code clean up for sanity