minor code cleanup and latest commit