Refactored list + updated readme