Cleaned up a 'lil