Some comments & cleanup