Cleanup and added directions