Cleanup and direction fix