Add feature to dev list.
Code cleanup.