Refactor

updated component to follow more polymer conventions