comments & cleanup for readability