some cleanup for future coding