changed path, cleaned up