clean up. rename. code highlight.