* Some refacotring, name cleanups.