Updating after cleaning improvements thanks to @mdavis1982