General cleanup from initial commit