add basic comments/cleanup