Cleaning up. Switching to sugar syntax.