cleaned up polymer elements a bit