Cleaning up interesting coding style