Cleanup and better syntax