Documented and cleaned up features