Add and update comments. Re-factor naming.