Cleaned up my code (ever so slightly...)