Additional cleanup and features