Let's get pretty. Improving the source code.