Small update and code cleanup