Started cleaning up example application code.