clean up. Refactor components