Working copy, a little function cleanup would be nice.
Styling.