Add comments & cleanup