Adding Record ID and some general cleanup